projects
/
project
/
odhcpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
33858d3
)
remove leftover fallout from prefix class support
author
Steven Barth
<
[email protected]
>
Mon, 20 Apr 2015 17:07:45 +0000
(19:07 +0200)
committer
Steven Barth
<
[email protected]
>
Mon, 20 Apr 2015 17:07:45 +0000
(19:07 +0200)
src/dhcpv6-ia.c
patch
|
blob
|
history
src/dhcpv6.h
patch
|
blob
|
history
diff --git
a/src/dhcpv6-ia.c
b/src/dhcpv6-ia.c
index 7e8e53520036ebab024101705838877c958a04df..132efdba938a45fc9b647517784808023f0b96a3 100644
(file)
--- a/
src/dhcpv6-ia.c
+++ b/
src/dhcpv6-ia.c
@@
-60,7
+60,6
@@
void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
free(c->managed);
free(c->hostname);
- free(c->classes);
free(c);
}
@@
-133,7
+132,6
@@
int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
a->hostname = strdup(lease->hostname);
}
} else {
- free(a->classes);
free(a->hostname);
free(a);
}
diff --git
a/src/dhcpv6.h
b/src/dhcpv6.h
index 44ce1d71fdadeb0db73a35dee1cdb0ca7f389d69..09aa6f13eb77602fb677ee227419d659be372ec5 100644
(file)
--- a/
src/dhcpv6.h
+++ b/
src/dhcpv6.h
@@
-59,11
+59,6
@@
#define DHCPV6_OPT_SOL_MAX_RT 82
#define DHCPV6_OPT_INF_MAX_RT 83
-#ifdef EXT_PREFIX_CLASS
-/* draft-bhandari-dhc-class-based-prefix, not yet standardized */
-#define DHCPV6_OPT_PREFIX_CLASS EXT_PREFIX_CLASS
-#endif
-
#define DHCPV6_DUID_VENDOR 2
#define DHCPV6_STATUS_OK 0
@@
-146,9
+141,6
@@
struct dhcpv6_assignment {
struct sockaddr_in6 peer;
time_t valid_until;
time_t reconf_sent;
- bool all_class;
- uint8_t classes_cnt;
- uint16_t *classes;
int reconf_cnt;
char *hostname;
uint8_t key[16];